Merge branch 'linwenxin_dev' of https://gogs.zfire.top/zfire-front/zfire-newmall-admin into develop

src/views/workOrder/basicEngineeringData/index.vue

@@ -54,7 +54,8 @@ import { orderEnginbaseList, orderEnginBaseListExport, orderEnginBaseSave, order
 import { lbsAmapRegion } from '@/api/common.js'
 import geographicalPosi from '@/components/geographicalPosi/index.vue'
 import { listPageV2 } from "@/api/auxiliaryFittings/attachmentProfile";
-import { materialNormList } from "@/api/auxiliaryChargeManagement";
+import { materialNormList } from "@/api/auxiliaryPriceManagement";
+
 export default {
   components: { TemplatePage, ImageUpload, geographicalPosi },
   mixins: [import_mixin, operation_mixin],
@@ -493,7 +494,7 @@ export default {
                                     }}
                                     onChange={val => {
                                       if (val) {
-                                        row[column.columnAttributes.propName] = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'categoryId', label: 'categoryName' }).find(item => item.value == val)?.label || ""
+                                        row[column.columnAttributes.propName] = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'goodsCategoryId', label: 'categoryName' }).find(item => item.value == val)?.label || ""
                                       } else {
                                         row[column.columnAttributes.propName] = ''
                                       }
@@ -502,7 +503,7 @@ export default {
                                     placeholder="请选择"
                                   >
                                     {
-                                      this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'categoryId', label: 'categoryName' }).map((item, index_) => (
+                                      this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId), { value: 'goodsCategoryId', label: 'categoryName' }).map((item, index_) => (
                                         <el-option key={index_} label={item.label} value={item.value}></el-option>
                                       ))
                                     }
@@ -538,13 +539,13 @@ export default {
                                     onChange={val => {
                                       this.delItemKey(3, row)
                                       if (val) {
-                                        var data = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.categoryId === row.goodsCategoryId), { value: 'normId', label: 'normName' }).find(item => item.value == val)
+                                        var data = this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.goodsCategoryId === row.goodsCategoryId), { value: 'goodsId', label: 'goodsName' }).find(item => item.value == val)
                                         row[column.columnAttributes.propName] = data?.label || ""
                                         if (data) {
-                                          row.goodsCode = data?.data?.normCode
-                                          row.goodsSpecification = data?.data?.specification
-                                          row.normType = data?.data?.normType
-                                          row.goodsStockUnit = data?.data?.unit
+                                          row.goodsCode = data?.data?.goodsCode
+                                          row.goodsSpecification = data?.data?.goodsSpecification
+                                          row.normType = "M"
+                                          row.goodsStockUnit = data?.data?.goodsStockUnit
                                         }
                                       } else {
                                         row[column.columnAttributes.propName] = ''
@@ -553,7 +554,7 @@ export default {
                                     placeholder="请选择"
                                   >
                                     {
-                                      this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.categoryId === row.goodsCategoryId), { value: 'normId', label: 'normName' }).map((item, index_) => (
+                                      this.arrQC(this.fucaiSel.filter(item => item.parentCategoryId === row.parentCategoryId && item.goodsCategoryId === row.goodsCategoryId), { value: 'goodsId', label: 'goodsName' }).map((item, index_) => (
                                         <el-option key={index_} label={item.label} value={item.value}></el-option>
                                       ))
                                     }
@@ -721,7 +722,7 @@ export default {
     commonColumns() {
       return [{
         columnAttributes: {
-          label: '收费标准（元）',
+          label: '销售价格（元）',
           prop: 'normAmount',
           width: 160
         },
@@ -748,65 +749,67 @@ export default {
             <div style="padding:0 6px">{row[column.columnAttributes.prop]}</div>
           )
         }
-      }, {
-        columnAttributes: {
-          label: '师傅分账金额（元）',
-          prop: 'workerAmount',
-          width: 160
-        },
-        render: (h, { row, column, index }) => {
-          return this.isEditIndex == index ? (
-            <div class="redbordererr">
-              <el-form-item
-                label=""
-                lebel-width="0px"
-                prop={`${this.activeName}.${index}.${column.columnAttributes.prop}`}
-                rules={required}
-              >
-                <el-input
-                  value={row[column.columnAttributes.prop]}
-                  onInput={val => {
-                    row[column.columnAttributes.prop] = val
-                  }}
-                  type="number"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </div>
-          ) : (
-            <div style="padding:0 6px">{row[column.columnAttributes.prop]}</div>
-          )
-        }
-      }, {
-        columnAttributes: {
-          label: '商户分账金额（元）',
-          prop: 'websitAmount',
-          width: 160
-        },
-        render: (h, { row, column, index }) => {
-          return this.isEditIndex == index ? (
-            <div class="redbordererr">
-              <el-form-item
-                label=""
-                lebel-width="0px"
-                prop={`${this.activeName}.${index}.${column.columnAttributes.prop}`}
-                rules={required}
-              >
-                <el-input
-                  value={row[column.columnAttributes.prop]}
-                  onInput={val => {
-                    row[column.columnAttributes.prop] = val
-                  }}
-                  type="number"
-                  placeholder="请输入"
-                ></el-input>
-              </el-form-item>
-            </div>
-          ) : (
-            <div style="padding:0 6px">{row[column.columnAttributes.prop]}</div>
-          )
-        }
-      }, {
+      }, 
+      // {
+      //   columnAttributes: {
+      //     label: '师傅分账金额（元）',
+      //     prop: 'workerAmount',
+      //     width: 160
+      //   },
+      //   render: (h, { row, column, index }) => {
+      //     return this.isEditIndex == index ? (
+      //       <div class="redbordererr">
+      //         <el-form-item
+      //           label=""
+      //           lebel-width="0px"
+      //           prop={`${this.activeName}.${index}.${column.columnAttributes.prop}`}
+      //           rules={required}
+      //         >
+      //           <el-input
+      //             value={row[column.columnAttributes.prop]}
+      //             onInput={val => {
+      //               row[column.columnAttributes.prop] = val
+      //             }}
+      //             type="number"
+      //             placeholder="请输入"
+      //           ></el-input>
+      //         </el-form-item>
+      //       </div>
+      //     ) : (
+      //       <div style="padding:0 6px">{row[column.columnAttributes.prop]}</div>
+      //     )
+      //   }
+      // }, {
+      //   columnAttributes: {
+      //     label: '商户分账金额（元）',
+      //     prop: 'websitAmount',
+      //     width: 160
+      //   },
+      //   render: (h, { row, column, index }) => {
+      //     return this.isEditIndex == index ? (
+      //       <div class="redbordererr">
+      //         <el-form-item
+      //           label=""
+      //           lebel-width="0px"
+      //           prop={`${this.activeName}.${index}.${column.columnAttributes.prop}`}
+      //           rules={required}
+      //         >
+      //           <el-input
+      //             value={row[column.columnAttributes.prop]}
+      //             onInput={val => {
+      //               row[column.columnAttributes.prop] = val
+      //             }}
+      //             type="number"
+      //             placeholder="请输入"
+      //           ></el-input>
+      //         </el-form-item>
+      //       </div>
+      //     ) : (
+      //       <div style="padding:0 6px">{row[column.columnAttributes.prop]}</div>
+      //     )
+      //   }
+      // }, 
+      {
         columnAttributes: {
           label: '操作',
           fixed: 'right',
@@ -865,7 +868,6 @@ export default {
             return (
               <zj-table
                 columns={[
-
                   {
                     columnAttributes: {
                       label: '操作类型',
@@ -1119,8 +1121,8 @@ export default {
               "productRelaName": "",
               "productUpdateBy": "",
               "productUpdateTime": "",
-              "websitAmount": '',
-              "workerAmount": ''
+              // "websitAmount": '',
+              // "workerAmount": ''
             })
             this.isEditIndex = 0
           }
@@ -1149,8 +1151,8 @@ export default {
           "productRelaName": "",
           "productUpdateBy": "",
           "productUpdateTime": "",
-          "websitAmount": '',
-          "workerAmount": ''
+          // "websitAmount": '',
+          // "workerAmount": ''
         })
         this.isEditIndex = 0
       }
@@ -1161,8 +1163,8 @@ export default {
         `${this.activeName}.${this.isEditIndex}.goodsCategoryId`,
         `${this.activeName}.${this.isEditIndex}.goodsId`,
         `${this.activeName}.${this.isEditIndex}.normAmount`,
-        `${this.activeName}.${this.isEditIndex}.workerAmount`,
-        `${this.activeName}.${this.isEditIndex}.websitAmount`,
+        // `${this.activeName}.${this.isEditIndex}.workerAmount`,
+        // `${this.activeName}.${this.isEditIndex}.websitAmount`,
       ]
     },
     verifyBtn() {