Fix: 委外状态问题

src/views/modules/production/scheduling-outsource.vue

@@ -128,14 +128,14 @@
                 align="center"
                 label="合格数量">
               </el-table-column>
-              <el-table-column
-                prop="technologyFile"
-                header-align="center"
-                align="center"
-                width="160"
-                :show-tooltip-when-overflow="true"
-                label="工艺文件">
-              </el-table-column>
+<!--              <el-table-column-->
+<!--                prop="technologyFile"-->
+<!--                header-align="center"-->
+<!--                align="center"-->
+<!--                width="160"-->
+<!--                :show-tooltip-when-overflow="true"-->
+<!--                label="工艺文件">-->
+<!--              </el-table-column>-->
               <el-table-column
                 prop="attachList"
                 header-align="center"

src/views/modules/production/scheduling.vue

@@ -12,7 +12,7 @@
         <el-form-item>
           <el-button @click="queryPage()">查询</el-button>
           <el-button v-if="isAuth('prod:production:planList')" type="primary" @click="batchPlan()">批量排产</el-button>
-          <el-button v-if="isAuth('pur:commDetail:save')" type="primary" @click="outsourceHandle2()">批量委外</el-button>
+<!--          <el-button v-if="isAuth('pur:commDetail:save')" type="primary" @click="outsourceHandle2()">批量委外</el-button>-->
         </el-form-item>
       </el-form>
       <el-table
@@ -77,6 +77,13 @@
           :formatter="formatState"
           label="当前状态">
         </el-table-column>
+        <el-table-column
+          prop="outsourcing"
+          header-align="center"
+          align="center"
+          :formatter="formatOutsourcingState"
+          label="委外状态">
+        </el-table-column>
         <el-table-column
           prop="notes"
           header-align="center"
@@ -93,7 +100,7 @@
           label="操作">
           <template slot-scope="scope">
             <el-button v-if="isAuth('prod:production:plan')" type="text" size="small" @click="detail(scope.row.id, true)">排产</el-button>
-            <el-button v-if="isAuth('pur:commDetail:save')" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>
+            <el-button v-if="isAuth('pur:commDetail:save') && Number(scope.row.outsourcing) === 0" type="text" size="small" @click="outsourceHandle(scope.row.id)">委外生产</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -147,6 +154,21 @@
             value: '生产完成'
           }
         ],
+        // 委外状态
+        outsourcingState: [
+          {
+            code: '0',
+            value: '正常'
+          },
+          {
+            code: '1',
+            value: '成品委外'
+          },
+          {
+            code: '2',
+            value: '工序委外'
+          }
+        ],
         multipleSelection: []
       }
     },
@@ -238,6 +260,14 @@
         const item1 = this.optionsState.find((item) => item.code === row.state.toString())
         return item1 ? item1.value : ''
       },
+      // 转换属性“委外状态”
+      formatOutsourcingState (row) {
+        if (!row.outsourcing) {
+          return ''
+        }
+        const item1 = this.outsourcingState.find((item) => item.code === row.outsourcing.toString())
+        return item1 ? item1.value : ''
+      },
       closeDialogEvent () {
         this.detailsVisible = false
       },

src/views/modules/sale/edit-product.vue

@@ -6,11 +6,11 @@
       :close-on-click-modal="false"
       :visible.sync="visible">
       <el-form :model="dataForm" :rules="dataRule" ref="dataForm" label-width="100px">
-        <el-row class="my-row">
-          <el-form-item label="工艺文件" prop="docId">
-            <doc-component v-model="dataForm.docId" :doc-id.sync="dataForm.docId" @change="docChanged"></doc-component>
-          </el-form-item>
-        </el-row>
+<!--        <el-row class="my-row">-->
+<!--          <el-form-item label="工艺文件" prop="docId">-->
+<!--            <doc-component v-model="dataForm.docId" :doc-id.sync="dataForm.docId" @change="docChanged"></doc-component>-->
+<!--          </el-form-item>-->
+<!--        </el-row>-->
         <el-row class="my-row">
           <el-form-item label="要求说明" prop="specificationExplian">
             <el-input v-model="dataForm.specificationExplian" :disabled="false" placeholder="要求说明"></el-input>
@@ -43,8 +43,8 @@
         id: 0,
         taxRateVal: 0,
         dataRule: {
-          specificationExplian: [{ required: true, message: '要求说明不能为空', trigger: 'blur' }],
-          docId: [{ required: true, message: '请选择工艺文件', trigger: 'change' }]
+          specificationExplian: [{ required: true, message: '要求说明不能为空', trigger: 'blur' }]
+          // docId: [{ required: true, message: '请选择工艺文件', trigger: 'change' }]
         },
         fileList: [] // 附件
       }

src/views/modules/sale/outsource-add-or-update.vue

@@ -125,14 +125,14 @@
                 align="center"
                 label="合格数量">
               </el-table-column>
-              <el-table-column
-                prop="technologyFile"
-                header-align="center"
-                align="center"
-                min-width="160"
-                :show-tooltip-when-overflow="true"
-                label="工艺文件">
-              </el-table-column>
+<!--              <el-table-column-->
+<!--                prop="technologyFile"-->
+<!--                header-align="center"-->
+<!--                align="center"-->
+<!--                min-width="160"-->
+<!--                :show-tooltip-when-overflow="true"-->
+<!--                label="工艺文件">-->
+<!--              </el-table-column>-->
               <el-table-column
                 prop="attachList"
                 header-align="center"

src/views/modules/sale/outsource-detail.vue

@@ -134,14 +134,14 @@
             align="center"
             label="合格数量">
           </el-table-column>
-          <el-table-column
-            prop="technologyFile"
-            header-align="center"
-            align="center"
-            min-width="160"
-            :show-tooltip-when-overflow="true"
-            label="工艺文件">
-          </el-table-column>
+<!--          <el-table-column-->
+<!--            prop="technologyFile"-->
+<!--            header-align="center"-->
+<!--            align="center"-->
+<!--            min-width="160"-->
+<!--            :show-tooltip-when-overflow="true"-->
+<!--            label="工艺文件">-->
+<!--          </el-table-column>-->
           <el-table-column
             prop="attachList"
             header-align="center"

src/views/modules/sale/outsource.vue

@@ -152,17 +152,14 @@
           :show-tooltip-when-overflow="true"
           label="供应商">
         </el-table-column>
-        <el-table-column
-          prop="technologyFile"
-          header-align="center"
-          align="center"
-          min-width="140"
-          :show-tooltip-when-overflow="true"
-          label="工艺文件">
-<!--          <template slot-scope="scope">-->
-<!--            <el-button :disabled="!scope.row.noticeAttachList || scope.row.noticeAttachList.length === 0" type="text" size="small" @click="changeDetails(scope.row)">查看</el-button>-->
-<!--          </template>-->
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="technologyFile"-->
+<!--          header-align="center"-->
+<!--          align="center"-->
+<!--          min-width="140"-->
+<!--          :show-tooltip-when-overflow="true"-->
+<!--          label="工艺文件">-->
+<!--        </el-table-column>-->
         <el-table-column
           header-align="center"
           align="center"