前端修改上传合同附件，支持docx

src/views/contractManagement/acquisitionContract.vue

@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-      <div v-if="applstatus">
+      <!-- <div v-if="applstatus"> -->
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      </div>
+      <!-- </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
     </WinseaContentModal>
   </div>
 </template>

src/views/contractManagement/acquisitionContractAdd.vue

@@ -243,7 +243,7 @@
       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过3000字"
         maxlength="3000" />
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
     </ws-form>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/acquisitionContractEdit.vue

@@ -162,7 +162,7 @@
         </div>
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
       </base-card>
     </ws-form>
@@ -1447,4 +1447,4 @@
     color:#000;
     border:1px solid #ccc;
   }
-</style>
+</style>

src/views/contractManagement/purchaseContract.vue

@@ -200,14 +200,14 @@
 
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <div v-if="applstatus">
+        <!-- <div v-if="applstatus"> -->
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      </div>
+      <!-- </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
     </WinseaContentModal>
   </div>
 </template>
@@ -357,7 +357,7 @@
       }
     },
     activated() {
-      this.applstatus=hasPermission('contractManagement.buyContract.buyContractInfo.appl')
+      // this.applstatus=this.global.hasPermission('contractManagement.buyContract.buyContractInfo.appl')
       //cg.viewBudget
       //cg.viewSpareMoney
       // this.getVesselData();

src/views/contractManagement/purchaseContractAdd.vue

@@ -401,7 +401,7 @@
       <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过3000字"
         maxlength="3000" />
       <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
     </ws-form>
     <div v-if="dialogVisible" class="map">

src/views/contractManagement/purchaseContractEdit.vue

@@ -291,7 +291,7 @@
         </div>
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
           v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`" />
       </base-card>
     </ws-form>

src/views/contractManagement/salesContract.vue

@@ -202,14 +202,14 @@
     </el-pagination>
     <WinseaContentModal v-model="accessoryTFs" :title="$t('system.noticeCircular.information')"
       @on-cancel="handleClose">
-        <div v-if="applstatus">
+        <!-- <div v-if="applstatus"> -->
       <ws-upload ref="upload" :size-limit="size" @onChange="onChange" :comp-id="compId" :appendix-ids="appendixIdss"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" 
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" 
         v-hasPermission="`contractManagement.buyContract.buyContractInfo.appl`"
         />
-      </div>
+      <!-- </div>
       <ws-upload v-else ref="upload" :comp-id="compId" :appendix-ids="appendixIdss" :editable="false"
-        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" />
+        accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" /> -->
     </WinseaContentModal>
     <el-dialog
     title="合同完成"

src/views/contractManagement/salesContractAdd.vue

@@ -392,7 +392,7 @@
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="3000" />
         <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :size-limit="size"
-          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar"
+          @onChange="onChange" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar"
           v-hasPermission="`contractManagement.salesContract.salesContractInfo.appl`" />
       </ws-form>
       <div v-if="dialogVisible" class="map">

src/views/contractManagement/salesContractEdit.vue

@@ -376,7 +376,7 @@
         <!--备注信息-->
         <ws-input v-model="deptBudgetList.remarks" type="textarea" row="3" placeholder="请输入备注信息，不超过200字"
           maxlength="200" />
-        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .zip, .rar" v-hasPermission="
+        <ws-upload ref="upload" :comp-id="compId" :appendix-ids="deptBudgetList.addressUrl" :editable="true" accept=".jpg, .jpeg, .png, .pdf, .doc, .docx, .zip, .rar" v-hasPermission="
             `contractManagement.salesContract.salesContractInfo.appl`"/>
       </ws-form>
     </div>

src/views/houseSelfCollect/acquisitionManagement.vue

@@ -55,7 +55,7 @@
           <el-button v-if="scope.row.status!='审核中'" size="mini" @click="newAcquisition(scope.$index, scope.row,'编辑')"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.edit`">编辑</el-button>
           <el-button v-if="scope.row.status=='审核中'" size="mini" :disabled="!scope.row.taskId"
-            @click="newAcquisition(scope.$index, scope.row,'审核中')">审核中</el-button>
+            @click="newAcquisition(scope.$index, scope.row,'审核中')">{{scope.row.approveStatus}}</el-button>
           <el-button size="mini" :disabled="!userJurisdiction" type="danger" @click="delRow(scope.$index, scope.row)"
             v-hasPermission=" `acquisitionManagement.acquisitionCustomer.delete`">删除</el-button>
           <el-button size="mini" @click="print(scope.$index, scope.row)">打印</el-button>

src/views/taskManagement/tranManagementWarehouseInOutTaskEdit.vue

@@ -175,6 +175,7 @@
             span="1"
           >
             <el-input
+            :disabled="dataList.inOutType=='销售出库'"
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"
@@ -426,6 +427,7 @@
             span="1"
           >
             <el-input
+            :disabled="dataList.inOutType=='销售出库'"
               @input="weightchange"
               v-model="dataList1.weight"
               placeholder="请输入重量（吨）"
@@ -640,6 +642,7 @@
             span="1"
           >
             <el-input
+            :disabled="dataList.inOutType=='销售出库'"
               v-model="dataList.weight"
               placeholder="请输入重量（吨）"
               maxlength="120"