bug修改

src/views/purchase/DemandSummary/add.vue

@@ -185,7 +185,7 @@ export default {
         let param = this.ids.join()
         shutDownSummary(param).then(res => {
           if (res.code === 200) {
-            this.$modal.msgSuccess("取消成功");
+            this.$modal.msgSuccess("操作成功");
             this.getDetails(this.row)
           }
         })

src/views/purchase/DemandSummary/index.vue

@@ -27,7 +27,7 @@
               @focus="chooseTreeRefer('MATERIALCLASSIFY_PARAM', false, '选择品类')"
               style="width: 200px"
               >
-              <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.id" />
+              <el-option v-for="item in classOptions" :key="item.id" :label="item.name" :value="item.name" />
             </el-select>
             </el-form-item>
           </el-col>
@@ -506,6 +506,7 @@ export default {
     reset() {
       this.queryParams = {
         rowStatus: [],
+        buyer: '',
         buyerName: '',
         materialName: '',
         manufacturer: '',
@@ -640,7 +641,8 @@ export default {
     selectionsToInput(selection) {
       if (this.referCondition.title == '采购员') {
         this.personOptions = selection
-        this.queryParams.buyerName = selection[0].code
+        this.queryParams.buyer = selection[0].code
+        this.queryParams.buyerName = selection[0].name
       }
       if (this.referCondition.title == '业务部门') {
         this.deptOptions = selection
@@ -686,7 +688,7 @@ export default {
     },
     selectionsToInput2(selection) {
       this.classOptions.push(selection)
-      this.queryParams.materialName = selection.id
+      this.queryParams.materialName = selection.name
     },
     // 搜索区物料编码
     chooseMaterial() {

src/views/purchase/PurchaseDemandList/add.vue

@@ -332,7 +332,7 @@
           <el-table-column label="收货仓库" align="center"  prop="deliveryWarehouseName" width="200px">
             <template slot-scope="scope">
               <el-form-item class="hang">
-                <el-input clearable readonly size="small" v-model="scope.row.deliveryWarehouseName">
+                <el-input clearable size="small" v-model="scope.row.deliveryWarehouseName" @focus="chooseDept(scope.$index, 'WAREHOUSE_PARAM', true, '选择收货仓库')">
                   <el-button size="small" :disabled="sonDisable" slot="append" icon="el-icon-more" @click="chooseDept(scope.$index, 'WAREHOUSE_PARAM', true, '选择收货仓库')"></el-button>
                 </el-input>
               </el-form-item>

src/views/purchase/transferOrder/add.vue

@@ -87,7 +87,7 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调出部门">
-              <el-select clearable size="small" v-model="basicForm.deliveryDept" :disabled="sonDisable" @focus="chooseRefer('DEPT_PARAM', true, '调出部门')" style="width: 200px">
+              <el-select clearable size="small" v-model="basicForm.deliveryDept" :disabled="sonDisable" @focus="chooseRefer('DEPT_PARAM', true, '调出部门', basicForm.deliveryInventoryOrg)" style="width: 200px">
                 <el-option v-for="item in deptOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -158,7 +158,7 @@
          </el-col>
         <el-col :span="1.5">
             <el-form-item label="调入仓库">
-              <el-select clearable size="small" v-model="basicForm.storageWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库')" style="width: 200px">
+              <el-select clearable size="small" v-model="basicForm.storageWarehouse" :disabled="sonDisable" @focus="chooseRefer('WAREHOUSE_PARAM', true, '调入仓库', basicForm.storageInventoryOrg, 'N', 'N')" style="width: 200px">
                 <el-option v-for="item in ruHouseOptions" :key="item.id" :label="item.name" :value="item.id" />
               </el-select>
             </el-form-item>
@@ -186,11 +186,12 @@
             </el-form-item>
         </el-col>
         <el-col :span="1.5">
-            <el-form-item label="是否已同步WMS">
-              <el-select clearable size="small" v-model="basicForm.isSendWms" :disabled="sonDisable" style="width: 200px">
-                <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
-              </el-select>
-            </el-form-item>
+          <el-form-item label="单据状态">
+            <el-select disabled v-model="basicForm.status" size="small" style="width: 200px" clearable>
+              <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
+              </el-option>
+            </el-select>
+          </el-form-item>
         </el-col>
         <el-col :span="1.5">
             <el-form-item label="备注">
@@ -203,13 +204,20 @@
               />
             </el-form-item>
         </el-col>
-        <el-col :span="1.5">
-            <el-form-item label="单据状态">
-              <el-select disabled v-model="basicForm.status" size="small" style="width: 200px" clearable>
-                <el-option v-for="dict in dict.type.sys_status" :key="dict.value" :label="dict.label" :value="dict.value">
-                </el-option>
-              </el-select>
-            </el-form-item>
+      </el-row>
+
+      <el-row>
+        <el-col :span="20">
+          <el-form-item label="同步NC结果">
+              <el-input
+                v-model="basicForm.isSendWms"
+                type="textarea"
+                :rows="3"
+                size="small"
+                disabled
+                clearable
+              />
+          </el-form-item>
         </el-col>
       </el-row>
 
@@ -793,10 +801,13 @@ export default {
       console.log('删除行:', index)
       this.materialInfo.splice(index, 1)
     },
-    chooseRefer(type, isPage, title) {
+    chooseRefer(type, isPage, title, pkOrg, isDirectStore, gubFlag) {
       this.referCondition.type = type
       this.referCondition.isPage = isPage
       this.referCondition.title = title
+      this.referCondition.pkOrg = pkOrg
+      this.referCondition.isDirectStore = isDirectStore
+      this.referCondition.gubFlag = gubFlag
       this.$refs.refer.init(this.referCondition)
     },
     selectionsToInput(selection) {

src/views/purchase/transferOrder/index.vue

@@ -110,7 +110,7 @@
           <el-table-column label="调入仓库" align="center" prop="storageWarehouseName" width="150px"/>
           <el-table-column label="物流项目组" align="center" prop="materialProject" width="150px"/>
           <el-table-column label="利润中心" align="center" prop="liacenterName" width="150px"/>
-          <el-table-column label="已同步WMS" align="center" prop="isSendWms" width="150px"/>
+          <!-- <el-table-column label="已同步WMS" align="center" prop="isSendWms" width="150px"/> -->
           <el-table-column label="备注" align="center" prop="remark" width="150px"/>
           <el-table-column label="单据状态" align="center" prop="status" width="150px"/>
           <el-table-column label="制单人" align="center" prop="createByName" width="150px"/>

vue.config.js

@@ -45,7 +45,7 @@ module.exports = {
         // target: `http://172.16.13.152:8000/drp-admin`, //豪哥本地
         // target: `http://172.16.13.47:8000/drp-admin`, //石杨本地
         // target: `http://172.16.13.113:8000/drp-admin`, //DWT本地
-        target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
+        // target: `http://172.16.13.77:8000/drp-admin`, //TQ本地
         changeOrigin: true,
         pathRewrite: {
           ["^" + process.env.VUE_APP_BASE_API]: "",