Merge remote-tracking branch 'origin/0.8.X' into 0.8.X

klp-ui/src/components/KLPService/ProductSelect/index.vue

@@ -205,7 +205,7 @@ export default {
         this.recentLoading = true;
         // 从localstorage中获取缓存的ids
         const ids = localStorage.getItem('recentlySelectedProductIds') || '';
-        const idsArray = ids.split(',');
+        const idsArray = ids.split(',').filter(id => id);
         if (idsArray.length === 0) return;
         const list = await Promise.all(idsArray.map(async id => {
           const response = await getProduct(id);

klp-ui/src/components/KLPService/RawMaterialSelect/index.vue

@@ -215,7 +215,8 @@ export default {
         this.recentLoading = true;
         // 从localstorage中获取缓存的ids
         const ids = localStorage.getItem('recentlySelectedRawMaterialIds') || '';
-        const idsArray = ids.split(',');
+        const idsArray = ids.split(',').filter(id => id);
+        console.log('idsArray', idsArray, idsArray.length === 0);
         if (idsArray.length === 0) return;
         const list = await Promise.all(idsArray.map(async id => {
           const response = await getRawMaterial(id);

klp-ui/src/layout/components/AppMain.vue

@@ -17,6 +17,7 @@ export default {
   components: { iframeToggle },
   computed: {
     cachedViews() {
+      console.log(this.$store.state.tagsView.cachedViews)
       return this.$store.state.tagsView.cachedViews
     },
     key() {

klp-ui/src/views/wms/coil/panels/base.vue

@@ -96,7 +96,12 @@
       <el-table-column v-if="showAbnormal" label="异常数量" align="center" prop="abnormalCount"></el-table-column>
       <el-table-column label="长度 (米)" align="center" prop="length" v-if="showLength" />
       <el-table-column label="更新时间" align="center" prop="updateTime" />
-      <el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" />
+      <el-table-column label="发货时间" align="center" v-if="showExportTime" prop="exportTime" width="160">
+        <template slot-scope="scope">
+          <el-date-picker @change="handleExportTimeChange(scope.row)" v-if="canEditExportTime" style="width: 90%" v-model="scope.row.exportTime" type="datetime" value-format="yyyy-MM-dd HH:mm:ss" placeholder="选择发货时间" />
+          <div v-else>{{ scope.row.exportTime }}</div>
+        </template>
+      </el-table-column>
       <el-table-column label="更新人" align="center" prop="updateByName" />
 
       <el-table-column label="二维码" v-if="qrcode">
@@ -173,7 +178,7 @@
             clearable />
         </el-form-item>
         <el-form-item label="班组" prop="team">
-          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.team" placeholder="请选择班组" style="width: 100%" >
             <el-option key="甲" label="甲" value="甲" />
             <el-option key="乙" label="乙" value="乙" />
           </el-select>
@@ -193,7 +198,7 @@
           <div v-else>请先选择材料类型</div>
         </el-form-item>
         <el-form-item v-if="form.materialType === '成品'" label="质量状态" prop="qualityStatus">
-          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.qualityStatus" placeholder="请选择质量状态" style="width: 100%">
             <el-option label="A+" value="A+" />
             <el-option label="A" value="A" />
             <el-option label="A-" value="A-" />
@@ -207,19 +212,19 @@
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="切边要求" prop="trimmingRequirement">
-          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.trimmingRequirement" placeholder="请选择切边要求" style="width: 100%">
             <el-option label="净边料" value="净边料" />
             <el-option label="毛边料" value="毛边料" />
           </el-select>
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="打包状态" prop="packingStatus">
-          <el-input v-model="form.packingStatus" placeholder="请输入打包状态" :disabled="readonly">
+          <el-input v-model="form.packingStatus" placeholder="请输入打包状态">
           </el-input>
         </el-form-item>
 
         <el-form-item v-if="form.materialType === '成品'" label="包装要求" prop="packagingRequirement">
-          <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%" :disabled="readonly">
+          <el-select v-model="form.packagingRequirement" placeholder="请选择包装要求" style="width: 100%">
             <el-option label="裸包" value="裸包" />
             <el-option label="普包" value="普包" />
             <el-option label="简包" value="简包" />
@@ -503,6 +508,12 @@ export default {
       }
       return '物品类型';
     },
+    canEditExportTime() {
+      // 徐梦琪和若依管理员
+      const canEdit = ['1988841895986642945', 1];
+      const currentUserId = this.$store.getters.id;
+      return canEdit.includes(currentUserId);
+    },
   },
   created() {
     this.getList();
@@ -529,7 +540,7 @@ export default {
         endTime: this.queryParams.updateTime?.[1],
       }
       // 如果没有设置itemType，则设置为raw_material
-      query.selectType = 'raw_material';
+      query.selectType = this.querys.materialType === '成品' ? 'product' : 'raw_material';
       listMaterialCoil(query).then(response => {
         if (this.querys.warehouseId != 111) {
           // 排除掉111仓库的
@@ -795,6 +806,18 @@ export default {
       }).catch(() => {
       });
     },
+    handleExportTimeChange(row) {
+      if (row.exportTime) {
+        row.exportTime = row.exportTime.replace('T', ' ');
+      }
+      console.log(row);
+      updateMaterialCoilSimple(row).then(_ => {
+        this.$modal.msgSuccess("发货时间修改成功");
+        this.getList();
+      }).finally(() => {
+        this.buttonLoading = false;
+      });
+    },
     /** 删除按钮操作 */
     handleDelete(row) {
       const coilIds = row.coilId || this.ids;