Merge branch 'master' of http://110.41.163.243:9980/kd-aiot/kd-aiot-frontend-wt

src/App.vue

@@ -11,7 +11,7 @@
   export default {
     name: 'App',
     created () {
-      console.log('我是子应用------------------------------------');
+      console.log('我是子应用-----------');
       // 恢复主题
       this.$store.dispatch('theme/recoverTheme');
       if (!sessionStorage.filePath) {

src/views/bpm/handleTask/components/businessOpportunity/addOpportunityDialog.vue

@@ -108,6 +108,7 @@
     </el-form>
     <headerTitle title="产品清单"></headerTitle>
     <inventoryTable
+      :isCustomerMark="false"
       ref="inventoryTable"
       :isDeliveryDeadline="false"
       :isGuaranteePeriod="false"

src/views/bpm/handleTask/components/businessOpportunity/opportunityDetailDialog.vue

@@ -30,15 +30,15 @@
           </el-form-item>
         </el-col>
         <el-col :span="8">
-          <el-form-item label="赢单率：" prop="winRate">
-            {{ detailData.winRate + '%' }}
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="预算：" prop="budget">
-            {{ detailData.budget + '万元' }}
-          </el-form-item>
-        </el-col>
+            <el-form-item label="赢单率：" prop="winRate">
+              {{detailData.winRate? detailData.winRate + '%' : '' }}
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="预算：" prop="budget">
+              {{ detailData.budget? detailData.budget + '万元':'' }}
+            </el-form-item>
+          </el-col>
         <el-col :span="8">
           <el-form-item label="预计结单日期：" prop="expectedClosingDate">
             {{ detailData.expectedClosingDate }}
@@ -76,18 +76,20 @@
 
     <inventoryTable
     pageName="businessOpportunity"
-      v-if="['productionSupervisorApprove1','technicianApprove','techLeaderApprove','productionSupervisorApprove2'].includes(taskDefinitionKey)"
+      v-if="['productionSupervisorApprove1','technicianApprove','techLeaderApprove','productionSupervisorApprove2','salesManagerApprove'].includes(taskDefinitionKey)"
       ref="inventoryTable"
       :taskDefinitionKey=taskDefinitionKey
       :isDeliveryDeadline="false"
       :isGuaranteePeriod="false"
+      :isCustomerMark="false"
     ></inventoryTable>
 
     <inventoryTabledetail
-     v-if="!['productionSupervisorApprove1','technicianApprove','techLeaderApprove','productionSupervisorApprove2'].includes(taskDefinitionKey)"
+     v-if="!['productionSupervisorApprove1','technicianApprove','techLeaderApprove','productionSupervisorApprove2','salesManagerApprove'].includes(taskDefinitionKey)"
       ref="inventoryTabledetailRef"
       :isDeliveryDeadline="false"
       :isGuaranteePeriod="false"
+      :isCustomerMark="false"
     ></inventoryTabledetail>
     <!-- <el-card
       shadow="never"
@@ -274,7 +276,7 @@
             label: '销售总金额',
             slot: 'totalPrice',
             formatter: (_row, _column, cellValue) => {
-              return _row.totalPrice + '元';
+              return _row.totalPrice? _row.totalPrice + '元':'';
             }
           },
           {
@@ -295,7 +297,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {
@@ -328,7 +330,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {
@@ -342,6 +344,7 @@
     },
     created() {
       this.getDetailData(this.businessId);
+      console.log(this.taskDefinitionKey,'11111111111111111');
     },
     methods: {
       downloadFile(file) {

src/views/bpm/handleTask/components/businessOpportunity/submit.vue

@@ -49,7 +49,7 @@
         type="success"
         size="mini"
         @click="handleAudit(1)"
-        >通过
+      >通过
       </el-button>
       <!-- <el-button
         icon="el-icon-edit-outline"
@@ -65,7 +65,7 @@
         size="mini"
         @click="handleAudit(0)"
         v-if="!['starter', 'salesmanApprove'].includes(taskDefinitionKey)"
-        >驳回
+      >驳回
       </el-button>
 
       <!-- <el-button
@@ -96,179 +96,218 @@
 </template>
 
 <script>
-  import {
-    updateProduct,
-    UpdateInformation
-  } from '@/api/bpm/components/saleManage/businessOpportunity';
-  import { approveTaskWithVariables } from '@/api/bpm/task';
-  import { listAllUserBind } from '@/api/system/organization';
-  // 流程实例的详情页，可用于审批
-  export default {
-    name: '',
-    components: {},
-    props: {
-      businessId: {
-        default: ''
-      },
-      taskId: {
-        default: ''
-      },
-      id: {
-        default: ''
-      },
-      id: {
-        default: ''
-      },
-      taskDefinitionKey: {
-        default: ''
-      }
+import {
+  updateProduct,
+  UpdateInformation
+} from '@/api/bpm/components/saleManage/businessOpportunity';
+import {approveTaskWithVariables} from '@/api/bpm/task';
+import {listAllUserBind} from '@/api/system/organization';
+// 流程实例的详情页，可用于审批
+export default {
+  name: '',
+  components: {},
+  props: {
+    businessId: {
+      default: ''
     },
-
-    data() {
-      return {
-        form: {
-          technicianId: '',
-          reason: '',
-          technicalAnswerName: ''
-        },
-        userOptions: []
-      };
+    taskId: {
+      default: ''
     },
-    created() {
-      this.userOptions = [];
-      listAllUserBind().then((data) => {
-        this.userOptions.push(...data);
-      });
+    id: {
+      default: ''
     },
+    taskDefinitionKey: {
+      default: ''
+    }
+  },
 
-    methods: {
-      head() {
-        this.$refs.headRef.open();
+  data() {
+    return {
+      form: {
+        technicianId: '',
+        reason: '',
+        technicalAnswerName: ''
       },
+      userOptions: []
+    };
+  },
+  created() {
+    this.userOptions = [];
+    listAllUserBind().then((data) => {
+      this.userOptions.push(...data);
+    });
+  },
 
-      /** 处理转办审批人 */
-      handleUpdateAssignee() {
-        this.$emit('handleUpdateAssignee');
-      },
-      /** 退回 */
-      handleBackList() {
-        this.$emit('handleBackList');
-      },
+  methods: {
+    head() {
+      this.$refs.headRef.open();
+    },
 
-      async handleAudit(status) {
-        if (this.taskDefinitionKey === 'starter') {
-          let arr = await this.getTableValue();
-          if (!arr) {
-            return;
-          }
-          let data = await UpdateInformation(arr);
-          if (data.code != '0') {
-            return;
-          }
-        }
-        //生产主管审批选择技术员
-        if (
-          this.taskDefinitionKey === 'productionSupervisorApprove1' &&
-          status === 1
-        ) {
-          let data = await this.getTableValue();
-          let userIfon = this.userOptions.find(
-            (item) => item.id == this.form.technicianId
-          );
-          let isProduceDeliveryDeadline = true;
-          let arr = data.map((item) => {
-            if (!item.produceDeliveryDeadline) {
-              isProduceDeliveryDeadline = false;
-            }
-            return {
-              id: item.id,
-              produceDeliveryDeadline: item.produceDeliveryDeadline,
-              technicalAnswerId: this.form.technicianId,
-              technicalAnswerName: userIfon.name
-            };
-          });
+    /** 处理转办审批人 */
+    handleUpdateAssignee() {
+      this.$emit('handleUpdateAssignee');
+    },
+    /** 退回 */
+    handleBackList() {
+      this.$emit('handleBackList');
+    },
 
-          if (!isProduceDeliveryDeadline) {
-            this.$message.warning(`请选择生产交付交期！`);
-            return;
-          }
-          if (!this.form.technicianId) {
-            this.$message.warning(`请选择技术人员！`);
-            return;
-          }
-          if (!arr) {
-            return;
+    async handleAudit(status) {
+      if (this.taskDefinitionKey === 'starter') {
+        let arr = await this.getTableValue();
+        if (!arr) {
+          return;
+        }
+        let data = await UpdateInformation(arr);
+        if (data.code != '0') {
+          return;
+        }
+      }
+      //生产主管审批选择技术员
+      if (
+        this.taskDefinitionKey === 'productionSupervisorApprove1' &&
+        status === 1
+      ) {
+        let data = await this.getTableValue();
+        let userIfon = this.userOptions.find(
+          (item) => item.id == this.form.technicianId
+        );
+        let isProduceDeliveryDeadline = true;
+        let arr = data.map((item) => {
+          if (!item.produceDeliveryDeadline) {
+            isProduceDeliveryDeadline = false;
           }
+          return {
+            ...item,
+            id: item.id,
+            produceDeliveryDeadline: item.produceDeliveryDeadline,
+            technicalAnswerId: this.form.technicianId,
+            technicalAnswerName: userIfon.name
+          };
+        });
 
-          await updateProduct(arr);
+        if (!isProduceDeliveryDeadline) {
+          this.$message.warning(`请选择生产交付交期！`);
+          return;
         }
-        //技术员修改
-        if (this.taskDefinitionKey === 'technicianApprove' && status === 1) {
-          let data = await this.getTableValue();
-          let arr = data.map((item) => {
-            return {
-              id: item.id,
-              technicalDrawings: item.technicalDrawings || [],
-              industryArtFiles: item.industryArtFiles || [],
-              otherFiles: item.otherFiles || [],
-              remark: item.remark,
-              singleWeight: item.singleWeight,
-              technicalParams: item.technicalParams,
-              technicalAnswerId: item.technicalAnswerId,
-              technicalAnswerName: item.technicalAnswerName
-            };
-          });
-          // console.log(arr,'dasdasd')
-          // return
-          if (!arr) {
-            return;
-          }
-          await updateProduct(arr);
+        if (!this.form.technicianId) {
+          this.$message.warning(`请选择技术人员！`);
+          return;
         }
-        //销售员补充
-        if (this.taskDefinitionKey === 'salesmanApprove' && status === 1) {
-          let arr = await this.getTableValue();
-          if (!arr) {
-            return;
-          }
-          let data = await UpdateInformation(arr);
-          if (data.code != '0') {
-            return;
-          }
+        if (!arr) {
+          return;
         }
-        this._approveTaskWithVariables(status);
-      },
-      async _approveTaskWithVariables(status) {
-        let variables = {
-          pass: !!status
-        };
-        if (this.form.technicianId) {
-          variables['technicianId'] = this.form.technicianId;
+
+        await updateProduct(arr);
+      }
+      //技术员修改
+      if ((this.taskDefinitionKey === 'technicianApprove' || this.taskDefinitionKey === 'techLeaderApprove') && status === 1) {
+        let data = await this.getTableValue();
+        let arr = data.map((item) => {
+          return {
+            ...item,
+            id: item.id,
+            technicalDrawings: item.technicalDrawings || [],
+            industryArtFiles: item.industryArtFiles || [],
+            otherFiles: item.otherFiles || [],
+            remark: item.remark,
+            singleWeight: item.singleWeight,
+            technicalParams: item.technicalParams,
+            technicalAnswerId: item.technicalAnswerId,
+            technicalAnswerName: item.technicalAnswerName
+          };
+        });
+        // console.log(arr,'dasdasd')
+        // return
+        if (!arr) {
+          return;
         }
+        await updateProduct(arr);
+      }
+      //和销售主管审批
+      if ((this.taskDefinitionKey === 'salesManagerApprove') && status === 1) {
+        let arr = await this.getTableValue();
 
-        approveTaskWithVariables({
-          id: this.taskId,
-          reason: this.form.reason,
-          variables
-        }).then((res) => {
-          if (res.data.code != '-1') {
-            this.$emit('handleAudit', {
-              status,
-              title: status === 0 ? '驳回' : ''
-            });
+        let arrList = arr.map((item) => {
+          return {
+            ...item,
+            id: item.id,
+            singlePrice: item.singlePrice,
+            totalCount: item.totalCount,
+            totalPrice: item.totalPrice
+          };
+        }) || [];
+        if (!arrList.length) {
+          return;
+        }
+        await updateProduct(arrList);
+      }
+      //销售员补充
+      if ((this.taskDefinitionKey === 'salesmanApprove') && status === 1) {
+        let arr = await this.getTableValue();
+        let singlePrice = true;
+        let totalCount = true;
+        let arrList = arr?.productList.map((item) => {
+          if (!item.singlePrice) {
+            singlePrice = false;
           }
-        });
-      },
+          if (!item.totalCount) {
+            totalCount = false;
+          }
+          return {
+            ...item,
+            id: item.id,
+            singlePrice: item.singlePrice,
+            totalCount: item.totalCount,
+            totalPrice: item.totalPrice
+          };
+        }) || [];
+        if (!singlePrice) {
+          this.$message.warning(`请输入单价`);
+          return;
+        }
+        if (!totalCount) {
+          this.$message.warning(`请输入数量`);
+          return;
+        }
+        if (!arrList.length) {
+          return;
+        }
+        await updateProduct(arrList);
+      }
+      this._approveTaskWithVariables(status);
+    },
+    async _approveTaskWithVariables(status) {
+      let variables = {
+        pass: !!status
+      };
+      if (this.form.technicianId) {
+        variables['technicianId'] = this.form.technicianId;
+      }
 
-      getTableValue() {
-        return new Promise((resolve, reject) => {
-          this.$emit('getTableValue', async (data) => {
-            resolve(await data);
+      approveTaskWithVariables({
+        id: this.taskId,
+        reason: this.form.reason,
+        variables
+      }).then((res) => {
+        if (res.data.code != '-1') {
+          this.$emit('handleAudit', {
+            status,
+            title: status === 0 ? '驳回' : ''
           });
+        }
+      });
+    },
+
+    getTableValue() {
+      return new Promise((resolve, reject) => {
+        this.$emit('getTableValue', async (data) => {
+          resolve(await data);
         });
-      }
+      });
     }
-  };
+  }
+};
 </script>
 
 <style lang="scss"></style>

src/views/bpm/handleTask/components/contractBook/addDialog.vue

@@ -383,6 +383,7 @@
         :contractStartDate="this.form.contractStartDate"
         :isDiscountTotalPrice="true"
         :contractBookType="form.type"
+        :isCustomerMark="false"
       ></inventoryTable>
       <headerTitle
         :title="form.type == '2' ? '付款方式' : '收款方式'"

src/views/bpm/handleTask/components/contractBook/detailDialog.vue

@@ -203,6 +203,7 @@
       ref="inventoryTabledetailRef"
       :isDiscountTotalPrice="true"
       :contractBookType="form.type"
+      :isCustomerMark="false"
     >
     </inventoryTabledetail>
 
@@ -377,7 +378,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {
@@ -411,7 +412,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {

src/views/bpm/handleTask/components/contractBook/inventoryTable.vue

@@ -87,7 +87,7 @@
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.totalCount'"
           :rules="{
-            required: pageName == 'businessOpportunity' ? false : true,
+            required: (pageName == 'businessOpportunity'||taskDefinitionKey=='salesManagerApprove') ? false : true,
             pattern: numberReg,
             message: '请输入数字',
             trigger: 'blur'
@@ -96,7 +96,7 @@
           <el-input
             v-model="scope.row.totalCount"
             placeholder="请输入"
-            :disabled="!!taskDefinitionKey"
+            :disabled="!!taskDefinitionKey&&taskDefinitionKey!=='salesManagerApprove'"
             @input="getTotalPrice(scope.row)"
           ></el-input>
         </el-form-item>
@@ -182,10 +182,11 @@
           </div>
           <div class="borderrightnone">
             <DictSelection
-              dictName="质保期单位"
+              dictName="保质期单位"
               clearable
               :disabled="!!taskDefinitionKey"
               v-model="scope.row.guaranteePeriodUnitCode"
+              @itemChange="(data)=>chaengUnitCode(data,scope.row, scope.$index)"
               @change="
                 setDeliveryDays(scope.row, scope.$index, 'guaranteePeriod')
               "
@@ -224,7 +225,7 @@
           style="margin-bottom: 20px"
           :prop="'datasource.' + scope.$index + '.singlePrice'"
           :rules="{
-            required: pageName == 'businessOpportunity' ? false : true,
+            required: (pageName == 'businessOpportunity'||taskDefinitionKey=='salesManagerApprove') ? false : true,
             pattern: numberReg,
             message: '请输入正确的单价',
             trigger: 'change'
@@ -234,7 +235,7 @@
             v-model="scope.row.singlePrice"
             placeholder="请输入"
             @input="getTotalPrice"
-            :disabled="!!taskDefinitionKey"
+            :disabled="!!taskDefinitionKey&&taskDefinitionKey!=='salesManagerApprove'"
           >
             <template slot="append">元</template>
           </el-input>
@@ -244,7 +245,7 @@
         v-slot:headerSinglePrice="{ column }"
         v-if="pageName != 'businessOpportunity' || isSinglePrice"
       >
-        <span class="is-required">{{ column.label }}</span>
+        <span :class="{'is-required':taskDefinitionKey!=='salesManagerApprove'}">{{ column.label }}</span>
       </template>
 
       <template v-slot:technicalAnswerName="{ row, $index }">
@@ -496,7 +497,7 @@
         type: Boolean
       },
       isCustomerMark: {
-        default: false,
+        default: true,
         type: Boolean
       },
       isSinglePrice: {
@@ -578,7 +579,7 @@
             prop: 'customerMark',
             label: '客户代号',
             slot: 'customerMark',
-            // show: this.isCustomerMark
+            show: this.isCustomerMark
           },
           {
             width: 160,
@@ -789,6 +790,7 @@
         this.$refs.table.reRenderTable();
       }
     },
+    created(){},
     methods: {
       openVersion(index) {
         this.$refs.versionRefs.open(index);
@@ -802,6 +804,9 @@
         );
         this.$set(this.form.datasource[index], 'technologyRouteId', data.id);
       },
+      chaengUnitCode(data,row, index){
+        console.log(data,row, index);
+      },
       setDeliveryDays(row, index, type, isAll) {
         if (isAll) {
           this.form.datasource.forEach((item, i) => {
@@ -839,6 +844,7 @@
           let guaranteePeriodUnitName = this.guaranteePeriodUnit(
             row.guaranteePeriodUnitCode
           );
+          console.log(guaranteePeriodUnitName,'===================');
           this.$set(
             this.form.datasource[index],
             'guaranteePeriodDeadline',
@@ -858,8 +864,6 @@
           : 'second';
       },
       setDay(addDay, dateType = 'day') {
-        console.log(addDay, 'addDay');
-        console.log(dateType, 'dateType');
         return dayjs(this.contractStartDate || new Date())
           .add(addDay, dateType)
           .format('YYYY-MM-DD');
@@ -875,7 +879,7 @@
               (v.totalCount * v.singlePrice)?.toFixed(2)) ||
             null;
           v.guaranteePeriodUnitName = this.getDictValue(
-            '质保期单位',
+            '保质期单位',
             v.guaranteePeriodUnitCode
           );
           v.technicalDrawings = v.technicalDrawings ? v.technicalDrawings : [];
@@ -884,6 +888,7 @@
 
           v.otherFiles = v.otherFiles || [];
         });
+        console.log(comitDatasource,'comitDatasourcecomitDatasourcecomitDatasource');
         return comitDatasource;
       },
       getPrice() {
@@ -927,7 +932,8 @@
           [];
         if (productList) {
           productList.forEach((item) => {
-            item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode + '';
+            item.guaranteePeriodUnitCode = item.guaranteePeriodUnitCode * 1 || '';
+            //item.guaranteePeriodUnitCode
             // if (item.deliveryDays) {
             //   item['deliveryDeadline'] =
             //     item['deliveryDeadline'] || this.setDay(item.deliveryDays);
@@ -951,10 +957,12 @@
         }
       },
       //计算单重
-      singleWeightChange(row) {
+      singleWeightChange(row={}) {
         if (row && row.singleWeight && row.totalCount) {
-          row.totalWeight = row.singleWeight * row.totalCount || 0;
+         return row.totalWeight = (row.singleWeight * row.totalCount).toFixed(2);
         }
+        return row.totalWeight = 0
+
       },
       //选择产品
       handParent(row, index) {

src/views/bpm/handleTask/components/contractBook/inventoryTabledetail.vue

@@ -91,7 +91,7 @@
         type: Boolean
       },
       isCustomerMark: {
-        default: false,
+        default: true,
         type: Boolean
       },
       isSinglePrice: {
@@ -157,7 +157,7 @@
             prop: 'customerMark',
             label: '客户代号',
             slot: 'customerMark',
-            // show: this.isCustomerMark
+            show: this.isCustomerMark
           },
           {
             width: 160,
@@ -241,7 +241,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriodUnitCode||'') + _row.guaranteePeriodUnitName;
             }
           },
           {
@@ -313,7 +313,9 @@
       };
     },
     computed: {},
-
+    created(){
+      console.log('333333333');
+    },
     methods: {
       //修改回显
       putTableValue(data) {

src/views/bpm/handleTask/components/contractBook/submit.vue

@@ -100,6 +100,7 @@
       };
     },
     created() {
+
       this.userOptions = [];
       listAllUserBind().then((data) => {
         this.userOptions.push(...data);

src/views/bpm/handleTask/components/purchaseOrder/detailDialog.vue

@@ -413,7 +413,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {
@@ -440,7 +440,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/addReturnGoodsDialog.vue

@@ -103,7 +103,7 @@
   import fileUpload from '@/components/upload/fileUpload';
   import dictMixins from '@/mixins/dictMixins';
   import { getReturnSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/returnGoods';
-  import { getReceiveSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
+  // import { getReceiveSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
   import inventoryTable from './inventoryTable.vue';
   import sendListDialog from './sendListDialog.vue';
   import { copyObj } from '@/utils/util';
@@ -183,7 +183,7 @@
     },
     created() {
       this.$store.commit('returnGoods/clearUserData');
-      this.getReturnSaleOrderrecordDetail(this.businessId);
+      this.getReturnSaleOrderrecordDetail1(this.businessId);
     },
     methods: {
       //删除产品
@@ -198,7 +198,7 @@
 
       //选择订单回调
       changeOrder(obj) {
-        this.getSendSaleOrderDetail(obj.id);
+       // this.getSendSaleOrderDetail(obj.id);
       },
 
       //发货单详情
@@ -218,7 +218,7 @@
       },
 
       //获取退货单详情
-      async getReturnSaleOrderrecordDetail(id) {
+      async getReturnSaleOrderrecordDetail1(id) {
         this.loading = true;
         const data = await getReturnSaleOrderrecordDetail(id);
         this.loading = false;

src/views/bpm/handleTask/components/purchaseOrder/returnGoods/submit.vue

@@ -44,7 +44,7 @@
         type="danger"
         size="mini"
         @click="handleAudit(0)"
-        v-if="!['purchase_return_approve'].includes(taskDefinitionKey)"
+        v-if="['storemanApprove'].includes(taskDefinitionKey)"
         >驳回
       </el-button>
 
@@ -121,7 +121,7 @@
     },
     async created() {
       if (this.taskDefinitionKey == 'storemanApprove') {
-        let data = await getReturnSaleOrderrecordDetail(this.businessId);
+        let data = await getReturnSaleOrderrecordDetail(this.businessId); 
         try {
           this.outInData = await getOutInBySourceBizNo(data.returnNo);
         } catch (error) {

src/views/bpm/handleTask/components/quotation/addDialog.vue

@@ -174,6 +174,7 @@
       <headerTitle title="报价单产品清单"></headerTitle>
       <inventoryTable
         ref="inventoryTable"
+        :isCustomerMark="false"
         :isDeliveryDeadline="false"
         :isGuaranteePeriod="false"
       ></inventoryTable>

src/views/bpm/handleTask/components/quotation/detailDialog.vue

@@ -140,11 +140,11 @@
         </el-col>
         <el-col :span="6">
           <el-form-item
-            label="付款方式"
-            prop="payWay"
+            label="结算方式"
+            prop="settlementMode"
             style="margin-bottom: 22px"
           >
-            {{ form.payWayName }}
+            {{ form.settlementModeName }}
           </el-form-item>
         </el-col>
         <el-col :span="6">
@@ -163,11 +163,13 @@
 
     <inventoryTable
       ref="inventoryTable"
+      :isCustomerMark="false"
       :isDeliveryDeadline="false"
       :isGuaranteePeriod="false"
       v-if="taskDefinitionKey === 'technicianApprove'"
     ></inventoryTable>
     <inventoryTabledetail
+    :isCustomerMark="false"
       v-if="taskDefinitionKey != 'technicianApprove'"
       ref="inventoryTabledetailRef"
     ></inventoryTabledetail>
@@ -292,7 +294,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {

src/views/bpm/handleTask/components/saleOrder/detailDialog.vue

@@ -436,7 +436,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {
@@ -463,7 +463,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/inventoryTable.vue

@@ -465,7 +465,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {
@@ -504,7 +504,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {
@@ -719,6 +719,7 @@
           let guaranteePeriodUnitName = this.guaranteePeriodUnit(
             row.guaranteePeriodUnitCode
           );
+          console.log(guaranteePeriodUnitName,'=======================');
           this.$set(
             this.form.datasource[index],
             'guaranteePeriodDeadline',

src/views/bpm/handleTask/components/saleOrder/invoice/addInvoiceDialog.vue

@@ -327,7 +327,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {
@@ -354,7 +354,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoice/detailDialog.vue

@@ -323,7 +323,7 @@
             label: '质保期',
             slot: 'guaranteePeriod',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           // {
@@ -350,7 +350,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {

src/views/bpm/handleTask/components/saleOrder/invoice/product-list.vue

@@ -38,7 +38,7 @@
 <script>
   import { getpurchaseorderDetail } from '@/api/bpm/components/purchasingManage/purchaseOrder';
   import { getSendSaleOrderrecordDetail,getSaleOrderDetail } from '@/api/bpm/components/saleManage/saleorder';
-  // import { getReceiveSaleOrderrecordDetail } from '@/api/purchasingManage/purchaseorderreceive';
+   import { getReceiveSaleOrderrecordDetail } from '@/api/bpm/components/purchasingManage/purchaseorderreceive';
 
   export default {
     props: {

src/views/bpm/handleTask/components/saleOrder/returnGoods/detailDialog.vue

@@ -332,7 +332,7 @@
             label: '技术图纸',
             slot: 'technicalDrawings',
             formatter: (_row, _column, cellValue) => {
-              return _row.guaranteePeriod + _row.guaranteePeriodUnitName;
+              return (_row.guaranteePeriod||'') + _row.guaranteePeriodUnitName;
             }
           },
           {