Merge remote-tracking branch 'origin/master'

cy

2023-11-30 870a9499eb65de0031ef8e8f70607e5dfb64b806

 admin-web/src/views/departmentitem/itemdis/distribution/detail.vue

@@ -59,19 +59,19 @@
      </el-row>
      <el-form>
        <el-row class="card3" v-for="(mItem, mIndex) in goodsItem.models" :key="mIndex">
          <el-col :span="10">
            <el-form-item label="规格型号:"  style="margin-bottom: 0">
          <el-col style="padding: 10px 0" :span="10">
            <el-form-item label="规格型号1:"  style="margin-bottom: 0">
              {{ mItem.baseGoodsModelsName }}
            </el-form-item>
          </el-col>
          <el-col :span="4">
          <el-col style="padding: 10px 0" :span="4">
            <el-form-item label="单位:" style="margin-bottom: 0" label-width="80">
              {{mItem.unit}}
            </el-form-item>
          </el-col>
          <!--A类商品 -->
          <el-col :span="24" v-if="goodsItem.type==='A'">
            <el-row v-for="(user, u) in mItem.useInfo">
            <el-row v-for="(user, u) in mItem.useInfo" :key="u">
              <el-col :span="6">
                <el-form-item label="分发数量:" style="margin-bottom: 0" label-width="80">
                  {{user.num}}
@@ -113,10 +113,10 @@
  </win-lg>
</template>
<script>
import { transferDetail } from '@/api/stock/transfer';
import {transferDetail} from '@/api/stock/transfer';
import winLg from '@/components/win/win-lg';
import * as DateFormatter from '@/utils/DateFormatter';
import { getDownUrl } from '@/utils/base';
import {getDownUrl} from '@/utils/base';
import Viewer from 'viewerjs';
import 'viewerjs/dist/viewer.css';
import de from "element-ui/src/locale/lang/de";
@@ -225,11 +225,19 @@
};
</script>
<style lang="scss" scoped>
//@import url(../../../../styles/store.scss);
@import url(../../../../styles/store.scss);
.card3 {
  padding: 10px;
  margin-top: 10px;
  border-radius: 2px;
  background: #ffffff;
}
.img-box{
  width: 100px;
  height: 100px;
}
.img-box .img{
  width: 100px;
  height: 100px;
}
</style>