Merge branch 'master' into pengyouhao_dev

src/views/auxiliaryFittings/purchasingManagement/mixins/form_tpl.js

@@ -571,6 +571,38 @@ export default {
                 columnAttributes: {
                   label: '采购价格',
                   prop: 'cost'
+                },
+                render: (h, { row, column, index }) => {
+                  return row.isEditRow ? (
+                    <div class="redbordererr">
+                      <el-form-item label="" lebel-width="0px" prop={`items.${index}.cost`} rules={required}>
+                        <el-input
+                          type="number"
+                          value={row[column.columnAttributes.prop]}
+                          onInput={val => {
+                            row[column.columnAttributes.prop] = val
+                            if (!!~['auxiliaryMaterialsStorage', 'partsStorage'].indexOf(this.$route?.name)) {
+                              if (val) {
+                                row.costValue = this.setNumber(Number(row.recQty) * Number(val))
+                              } else {
+                                row.costValue = ''
+                              }
+                            } else if (!!~['returnAuxiliaryMaterials', 'partsReturn'].indexOf(this.$route?.name)) {
+                              if (val) {
+                                row.retValue = this.setNumber(Number(row.retQty) * Number(val))
+                              } else {
+                                row.retValue = ''
+                              }
+                            }
+                            this.$nextTick(this.jiaoyan)
+                          }}
+                          placeholder="请选择"
+                        ></el-input>
+                      </el-form-item>
+                    </div>
+                  ) : (
+                    <div>{row[column.columnAttributes.prop]}</div>
+                  )
                 }
               }
             ]
@@ -894,29 +926,29 @@ export default {
                       {!~[0, 1].indexOf(this.formDialogType)
                         ? this.formData.retTotalQty
                         : this.setNumber(
-                            [
-                              0,
-                              0,
-                              0,
-                              ...this.formData.items.map(row => {
-                                return Number(row.retQty)
-                              })
-                            ].reduce((a, b) => a + b)
-                          )}
+                          [
+                            0,
+                            0,
+                            0,
+                            ...this.formData.items.map(row => {
+                              return Number(row.retQty)
+                            })
+                          ].reduce((a, b) => a + b)
+                        )}
                     </el-descriptions-item>
                     <el-descriptions-item label="退款金额">
                       {!~[0, 1].indexOf(this.formDialogType)
                         ? this.formData.retTotalAmount
                         : this.setNumber(
-                            [
-                              0,
-                              0,
-                              0,
-                              ...this.formData.items.map(row => {
-                                return Number(row.cost) * Number(row.retQty)
-                              })
-                            ].reduce((a, b) => a + b)
-                          )}
+                          [
+                            0,
+                            0,
+                            0,
+                            ...this.formData.items.map(row => {
+                              return Number(row.cost) * Number(row.retQty)
+                            })
+                          ].reduce((a, b) => a + b)
+                        )}
                     </el-descriptions-item>
                   </el-descriptions>
                 ) : null}
@@ -1056,10 +1088,10 @@ export default {
             <div style="padding:0 6px;cursor: pointer;">
               {row.imageUrl
                 ? row.imageUrl
-                    .split(',')
-                    .map(url => (
-                      <el-image src={url} preview-src-list={[url]} fit="fit" style="width:80px;height:80px;" />
-                    ))
+                  .split(',')
+                  .map(url => (
+                    <el-image src={url} preview-src-list={[url]} fit="fit" style="width:80px;height:80px;" />
+                  ))
                 : null}
             </div>
           )
@@ -1265,7 +1297,7 @@ export default {
       this.formDialog = false
     },
     jiaoyan() {
-      this.$refs.formRef.validate((valid, invalidFields, errLabels) => {}, false)
+      this.$refs.formRef.validate((valid, invalidFields, errLabels) => { }, false)
     },
     setNumber(val) {
       return Number(val.toFixed(2))

src/views/mallManagement/invoice/index.vue

@@ -84,7 +84,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="24">
-              <el-form-item label="上传图片" prop="taxlink">
+              <el-form-item label="上传发票" prop="taxlink">
                 <el-upload class="avatar-uploader imageListUpload" style="height:0" :action="baseURL + 'common/upload'" :headers="myHeaders"
                   :show-file-list="false" :on-success="uploadSuccess" :before-upload="beforeUpload" :disabled="detailData.status">
                 </el-upload>
@@ -200,7 +200,7 @@ export default {
         taxTime: [{ required: true, message: '请选择发票时间', trigger: 'change' }],
         taxNumber: [{ required: true, message: '请输入发票代码', trigger: 'blur' }],
         taxCode: [{ required: true, message: '请输入发票号码', trigger: 'blur' }],
-        taxlink: [{ required: true, message: '请上传图片', trigger: 'change' }],
+        taxlink: [{ required: true, message: '请上传发票文件', trigger: 'change' }],
       },
 			formType: 'add',
 			formVisible: false,

src/views/mallManagement/order/offline_order_list/index.vue

@@ -145,12 +145,19 @@
                 {{scope.row.smallName}}
               </template>
             </el-table-column>
-            <el-table-column align="center" label="商品名称" prop="goodsName" min-width="120">
+            <el-table-column align="center" label="商品名称" prop="goodsMaterialId" min-width="160">
               <template slot-scope="scope">
-                {{scope.row.goodsName}}
+                <el-select size="small" v-model="scope.row.goodsMaterialId" filterable placeholder="请选择" @change="changeSpec(scope.$index, scope.row)">
+                  <el-option
+                    v-for="item in goodsSpecList"
+                    :key="item.id"
+                    :label="item.goodsName"
+                    :value="item.id">
+                  </el-option>
+                </el-select>
               </template>
             </el-table-column>
-            <el-table-column align="center" label="规格型号" prop="goodsMaterialId" min-width="120">
+            <el-table-column align="center" label="规格型号" prop="goodsMaterialId" min-width="160">
               <template slot-scope="scope">
                 <el-select size="small" v-model="scope.row.goodsMaterialId" filterable placeholder="请选择" @change="changeSpec(scope.$index, scope.row)">
                   <el-option

src/views/mallManagement/order/order_list/index.vue

@@ -29,10 +29,8 @@
           
                 <el-col :xs="24" :sm="12" :lg="6">
                   <el-form-item label="网点名称" prop="websitId">
-                    <el-select v-model="screenForm.websitId" placeholder="全部" filterable>
-                      <el-option label="全部" value=""></el-option>
-                      <el-option :label="item.name" :value="item.id" v-for="(item, index) in websiteList"
-                        :key="index"></el-option>
+                    <el-select v-model="screenForm.websitId" placeholder="请选择网点名称" filterable clearable>
+                      <el-option :label="item.name" :value="item.websitId" v-for="(item, index) in websiteList" :key="index"></el-option>
                     </el-select>
                   </el-form-item>
                 </el-col>

src/views/workOrder/basicEngineeringData/index.vue

@@ -444,6 +444,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -488,6 +489,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -532,6 +534,7 @@ export default {
                                   rules={required}
                                 >
                                   <el-select
+                                    filterable={true}
                                     value={row[column.columnAttributes.prop]}
                                     onInput={val => {
                                       row[column.columnAttributes.prop] = val
@@ -632,6 +635,7 @@ export default {
                                     rules={required}
                                   >
                                     <el-select
+                                      filterable={true}
                                       value={row[column.columnAttributes.prop]}
                                       onInput={val => {
                                         row[column.columnAttributes.prop] = val
@@ -924,6 +928,7 @@ export default {
     },
     // 打开弹窗
     openForm() {
+      this.isEditIndex = -1
       // 获取辅材下拉数据
       materialNormList({ "pageNum": 1, "pageSize": -1, "params": [{ "param": "a.status", "compare": "=", "value": "ON" }] }).then(res => {
         this.fucaiSel = res.data.records

src/views/workOrder/penaltyWorkOrder/index.vue

@@ -20,9 +20,9 @@
             </zj-form-module>
             <zj-form-module title="产品信息" :form-data="formData" :form-items="product">
             </zj-form-module>
-            <zj-form-module title="处罚信息" label-width="100px" :form-data="formData" :form-items="pandanxinxi">
+            <zj-form-module title="负激励信息" label-width="120px" :form-data="formData" :form-items="pandanxinxi">
             </zj-form-module>
-            <zj-form-module title="处置信息" label-width="100px" :form-data="formData" :form-items="czpandanxinxi">
+            <zj-form-module title="正激励信息" label-width="120px" :form-data="formData" :form-items="czpandanxinxi">
             </zj-form-module>
           </zj-form-container>
           <div slot="footer" class="dialog-footer">

src/views/workOrder/penaltyWorkOrder/mixins/czpandanxinxi.js

@@ -17,7 +17,7 @@ export default {
             disabled: this.formData.status == "OK"
           },
           formItemAttributes: {
-            label: '处置工单号',
+            label: '正激励工单号',
             prop: 'disposeOrderBaseId',
             // rules: [...required],
           }
@@ -87,7 +87,7 @@ export default {
             disabled: this.formData.status == "OK"
           },
           formItemAttributes: {
-            label: '处置工程师',
+            label: '正激励工程师',
             prop: 'disposeWorkerId',
             // rules: [...required],
           },

src/views/workOrder/penaltyWorkOrder/mixins/pandanxinxi.js

@@ -131,7 +131,7 @@ export default {
             disabled: this.formData.status == "OK"
           },
           formItemAttributes: {
-            label: '处罚工单号',
+            label: '负激励工单号',
             prop: 'orderBaseId',
             rules: [...required],
           }
@@ -192,7 +192,7 @@ export default {
           name: 'slot-component',
           md: 24,
           formItemAttributes: {
-            label: '处罚工程师',
+            label: '负激励工程师',
             prop: 'punishOrderWorkers',
             rules: [...required],
           },